From 4ee581f4704d52f8df3dcdf87f89221b2cc5bd9a Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Wed, 25 Mar 2009 19:02:28 +0000 Subject: [PATCH] Some vendor C compilers choke on C++ comments Patch from Gary V. Vaughan svn path=/trunk/; revision=398 --- ChangeLog | 11 +++++++++++ babl/babl-fish-path.c | 2 +- babl/babl-fish-stats.c | 8 +++++--- babl/base/model-rgb.c | 2 +- babl/base/rgb-constants.h | 4 +++- tests/babl_fish_path_fitness.c | 8 +++++--- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06e28f8..d144a39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. Some vendor C compilers choke on C++ + comments. + + * babl/babl-fish-path.c + * babl/babl-fish-stats.c + * babl/base/model-rgb.c + * babl/base/rgb-constants.h + * tests/babl_fish_path_fitness.c + 2009-03-25 Martin Nordholts * babl/babl-cpuaccel.h: Patch from Gary V. Vaughan. enum values diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c index b6a6582..b69cf63 100644 --- a/babl/babl-fish-path.c +++ b/babl/babl-fish-path.c @@ -373,7 +373,7 @@ test_create (void) return test; } -// FishPath instrumentation +/* FishPath instrumentation */ static Babl *fmt_rgba_double = NULL; static double *test = NULL; diff --git a/babl/babl-fish-stats.c b/babl/babl-fish-stats.c index a6c6980..ec19f5f 100644 --- a/babl/babl-fish-stats.c +++ b/babl/babl-fish-stats.c @@ -23,9 +23,11 @@ static FILE *output_file = NULL; static int qux = 0; static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" }; -//static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; -//static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; -//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +/* +static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; +static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; +static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +*/ static int table_destination_each (Babl *babl, diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c index 46e443b..8de970e 100644 --- a/babl/base/model-rgb.c +++ b/babl/base/model-rgb.c @@ -478,7 +478,7 @@ static void formats (void) { babl_format_new ( - //"name", "srgb", + /*"name", "srgb",*/ "id", BABL_SRGB, babl_model_from_id (BABL_RGB_GAMMA_2_2), babl_type_from_id (BABL_U8), diff --git a/babl/base/rgb-constants.h b/babl/base/rgb-constants.h index d8a428c..8f8b410 100644 --- a/babl/base/rgb-constants.h +++ b/babl/base/rgb-constants.h @@ -16,7 +16,9 @@ * . */ -//#define CONTEMPORARY_MONITOR +#if 0 +#define CONTEMPORARY_MONITOR +#endif #ifdef CONTEMPORARY_MONITOR /* source: http://www.poynton.com/ColorFAQ.html */ diff --git a/tests/babl_fish_path_fitness.c b/tests/babl_fish_path_fitness.c index 7090b4b..d5f5c4d 100644 --- a/tests/babl_fish_path_fitness.c +++ b/tests/babl_fish_path_fitness.c @@ -26,9 +26,11 @@ test_init (void) static int qux = 0; static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" }; -//static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; -//static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; -//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +/* +static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; +static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; +static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +*/ static int destination_each (Babl *babl, void *userdata) -- 2.30.2